From fdfe2a9800285734326badfa139bed9d07637b43 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Tue, 21 Aug 2007 21:56:03 -0700 Subject: [PATCH] Add changelog entry for manpage fix; adjust paths; fix misc-unseparated.diff. --- debian/changelog | 5 ++- debian/patches/fix-emacs-manpage.diff | 13 +++++-- debian/patches/misc-unseparated.diff | 49 --------------------------- debian/patches/series | 1 + 4 files changed, 15 insertions(+), 53 deletions(-) diff --git a/debian/changelog b/debian/changelog index a988d911b1d..1b7ec66adcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,10 @@ emacs22 (22.1+1-2) unstable; urgency=low "header". Thanks to Max Dmitrichenko . (closes: #432695) [rlb] - -- Rob Browning Sun, 29 Jul 2007 19:45:46 -0700 + * Incorporate upstream fixes to Emacs manpage. Thanks to Sven Joachim + .(closes: #432732) [rlb] + + -- Rob Browning Tue, 21 Aug 2007 21:36:19 -0700 emacs22 (22.1+1-1) unstable; urgency=low diff --git a/debian/patches/fix-emacs-manpage.diff b/debian/patches/fix-emacs-manpage.diff index 3e667fd621c..7b6b1661f7a 100644 --- a/debian/patches/fix-emacs-manpage.diff +++ b/debian/patches/fix-emacs-manpage.diff @@ -5,6 +5,9 @@ Added-by: Rob Browning Status: appears to be incorporated upstream + In addition to the upstream changes, the page has been adjusted for + Debian. + Upstream changelog entry: 2007-07-15 Werner Lemberg @@ -88,7 +91,7 @@ Index: sid/etc/emacs.1 many special packages handle mail reading (RMail) and sending (Mail), outline editing (Outline), compiling (Compile), running subshells within -@@ -81,130 +88,176 @@ +@@ -81,218 +88,299 @@ There is an extensive reference manual, but users of other Emacses should have little trouble adapting even @@ -311,7 +314,11 @@ Index: sid/etc/emacs.1 You will find the various .I X fonts in the -@@ -215,84 +268,119 @@ +-.I /usr/lib/X11/fonts ++.I /usr/share/fonts/X11 + directory. + Note that + .I Emacs will only accept fixed width fonts. Under the X11 Release 4 font-naming conventions, any font with the value "m" or "c" in the eleventh field of the font name is a fixed @@ -846,7 +853,7 @@ Index: sid/etc/emacs.1 -file /usr/local/emacs/etc/MAILINGLISTS. Bugs tend actually to be -fixed if they can be isolated, so it is in your interest to report -them in such a way that they can be easily reproduced. -+file /usr/share/emacs/$VERSION/etc/etc/MAILINGLISTS. ++file /usr/share/emacs/$VERSION/etc/MAILINGLISTS. +Bugs tend actually to be fixed if they can be isolated, so it is +in your interest to report them in such a way that they can be +easily reproduced. diff --git a/debian/patches/misc-unseparated.diff b/debian/patches/misc-unseparated.diff index 53942daa822..b11aa73b860 100644 --- a/debian/patches/misc-unseparated.diff +++ b/debian/patches/misc-unseparated.diff @@ -6,55 +6,6 @@ References to /usr/local/... have been changed to /usr/... as appropriate, etc. -Index: sid/etc/emacs.1 -=================================================================== ---- sid.orig/etc/emacs.1 -+++ sid/etc/emacs.1 -@@ -424,28 +424,28 @@ - manual is also included in the Emacs source distribution. - .PP - .SH FILES --/usr/local/share/info - files for the Info documentation browser. -+/usr/share/info - files for the Info documentation browser. - The complete text of the Emacs reference manual is included in a - convenient tree structured form. Also includes the Emacs Lisp - Reference Manual, useful to anyone wishing to write programs in the - Emacs Lisp extension language. - --/usr/local/share/emacs/$VERSION/lisp - Lisp source files and compiled files -+/usr/share/emacs/$VERSION/lisp - Lisp source files and compiled files - that define most editing commands. Some are preloaded; - others are autoloaded from this directory when used. - --/usr/local/libexec/emacs/$VERSION/$ARCH - various programs that are --used with GNU Emacs. -+/usr/lib/emacs/$VERSION/$ARCH - various programs that are used with -+GNU Emacs. - --/usr/local/share/emacs/$VERSION/etc - various files of information. -+/usr/share/emacs/$VERSION/etc - various files of information. - --/usr/local/share/emacs/$VERSION/etc/DOC.* - contains the documentation -+/usr/share/emacs/$VERSION/etc/DOC.* - contains the documentation - strings for the Lisp primitives and preloaded Lisp functions - of GNU Emacs. They are stored here to reduce the size of - Emacs proper. - - .br --/usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering -+/usr/share/emacs/$VERSION/etc/SERVICE lists people offering - various services to assist users of GNU Emacs, including education, - troubleshooting, porting and customization. - -@@ -466,7 +466,7 @@ - - Please do not send anything but bug reports to this mailing list. - For more information about Emacs mailing lists, see the --file /usr/local/emacs/etc/MAILINGLISTS. Bugs tend actually to be -+file /usr/share/emacs/$VERSION/etc/MAILINGLISTS. Bugs tend actually to be - fixed if they can be isolated, so it is in your interest to report - them in such a way that they can be easily reproduced. - .SH UNRESTRICTIONS Index: sid/etc/NEWS =================================================================== --- sid.orig/etc/NEWS diff --git a/debian/patches/series b/debian/patches/series index b7ffe992b2d..c1531c8ef51 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +fix-emacs-manpage.diff fix-bitmap-icon-arg.diff debian-site-init-el.diff debian-startup.diff -- 2.30.2